From 9291ef860a19cdc7ed0367d25cf984a1e31a6d1f Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Tue, 4 Aug 2009 21:01:20 +0200 Subject: [PATCH] babl: Fix compiler warnings Avoid redefinition and implicit casts --- babl/babl-extension.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/babl/babl-extension.c b/babl/babl-extension.c index 3ba28ae..1628d03 100644 --- a/babl/babl-extension.c +++ b/babl/babl-extension.c @@ -133,12 +133,15 @@ destroy_hook (void) #include #ifdef HAVE_DLFCN_H +#ifndef WIN32 #include #define HLIB void * +#endif /* WIN32 */ #elif HAVE_DL_H + #include #include #if !defined(DYNAMIC_PATH) @@ -175,6 +178,10 @@ static void *dlsym (HLIB handle, const char *name) { #define dlerror() GetLastError () #endif +typedef int (*BablExtensionInitFunc) (void); +typedef void (*BablExtensionDestroyFunc)(void); + + static Babl * load_failed (Babl *babl) { @@ -193,8 +200,8 @@ babl_extension_load (const char *path) /* do the actual loading thing */ HLIB dl_handle = NULL; - int (*init)(void) = NULL; - void (*destroy)(void) = NULL; + BablExtensionInitFunc init = NULL; + BablExtensionDestroyFunc destroy = NULL; dl_handle = dlopen (path, RTLD_NOW); if (!dl_handle) @@ -202,7 +209,7 @@ babl_extension_load (const char *path) babl_log ("dlopen() failed:\n\t%s", dlerror ()); return load_failed (babl); } - init = dlsym (dl_handle, "init"); + init = (BablExtensionInitFunc) dlsym (dl_handle, "init"); if (!init) { babl_log ("\n\tint babl_extension_init() function not found in extension '%s'", path); @@ -210,7 +217,7 @@ babl_extension_load (const char *path) return load_failed (babl); } - destroy = dlsym (dl_handle, "destroy"); + destroy = (BablExtensionDestroyFunc) dlsym (dl_handle, "destroy"); babl = extension_new (path, dl_handle, destroy); -- 2.30.2